From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Mon, 14 Feb 2011 22:13:25 +0000 (-0500)
Subject: Fix cursor when dragging a window over its current workspace
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8944
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=01097ac9545b8034ef08084bf10361d2db9079ab;p=gnome-shell.git

Fix cursor when dragging a window over its current workspace

When we are dragging a window over its current workspace or workspace
thumbnail, we show show "no drop possible" feedback instead
of "move here" feedback.

https://bugzilla.gnome.org/show_bug.cgi?id=642329
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 83bd9146a..074ba5a91 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1297,7 +1297,7 @@ Workspace.prototype = {
 
     // Draggable target interface
     handleDragOver : function(source, actor, x, y, time) {
-        if (source instanceof WindowClone)
+        if (source.realWindow && !this._isMyWindow(source.realWindow))
             return DND.DragMotionResult.MOVE_DROP;
         if (source.shellWorkspaceLaunch)
             return DND.DragMotionResult.COPY_DROP;
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index ab9ea9091..06dec6f6d 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -343,7 +343,7 @@ WorkspaceThumbnail.prototype = {
         if (this.state > ThumbnailState.NORMAL)
             return DND.DragMotionResult.CONTINUE;
 
-        if (source.realWindow)
+        if (source.realWindow && !this._isMyWindow(source.realWindow))
             return DND.DragMotionResult.MOVE_DROP;
         if (source.shellWorkspaceLaunch)
             return DND.DragMotionResult.COPY_DROP;